tools: Do not append trailing slash to XEN_ROOT in Makefiles

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 388a925d3684107a909d0712112026520ce6997a..48c98026b813b6dea6c99bab3ae8a198a224ebb6 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../
+XEN_ROOT = ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=

diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 2fb2f2b88731cd94270a722c75d25537169d472e..edf8ef8c04ae7483beae92942fc4690c0e1beca0 100644 (file)
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT=../../../
+XEN_ROOT=../../..
 BLKTAP_ROOT= ..
 include $(XEN_ROOT)/tools/Rules.mk
 

diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile
index 7267eac53a9edcda180b7f38d1ddaa516d68e48a..ca18512405f44ee64b0fecacfbb9e53bb5f722bc 100644 (file)
--- a/tools/blktap2/include/Makefile
+++ b/tools/blktap2/include/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT := ../../../
+XEN_ROOT := ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 .PHONY: all

diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index 2077423d51bf83014181fe92bb9c53a61479965a..d5e07b2202dc5287efaf829f3445a2f4003144a6 100644 (file)
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -1,5 +1,5 @@
-XEN_ROOT = ../../../
-BLKTAP_ROOT := ../
+XEN_ROOT = ../../..
+BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ifeq ($(LVM_UTIL_TEST),y)

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index aa8257a1a113dfa38da170fa8ca7bf60bd2eeb27..48a6e540b13c386958ca32a7af84ada232a3ef6e 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -1,5 +1,5 @@
-XEN_ROOT=../../../
-BLKTAP_ROOT := ../
+XEN_ROOT=../../..
+BLKTAP_ROOT := ..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y         :=

diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 60e121784924dba25a07e95a0f88a9ed4d305aa6..fa5b417619d70e8dc0a684556b5b234424916661 100644 (file)
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -1,12 +1,12 @@
-XEN_ROOT=../../../../
-BLKTAP_ROOT := ../../
+XEN_ROOT=../../../..
+BLKTAP_ROOT := ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 LIBVHD-MAJOR     = 1.0
 LIBVHD-MINOR     = 0
 LIBVHD-SONAME    = libvhd.so.$(LIBVHD-MAJOR)
 
-LVM-UTIL-OBJ    := $(BLKTAP_ROOT)lvm/lvm-util.o
+LVM-UTIL-OBJ    := $(BLKTAP_ROOT)/lvm/lvm-util.o
 
 LIBVHD-BUILD    := libvhd.a
 

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index bb3a72c9ba1ae60fd5f36fd8b344dfa318a0efa5..a911fff057e415fcceb0f3889c46bbb43a2dcad2 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../
+XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.

diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b5f9800de0d26e0752ff53b679ba5c7f954ace73..fa9e2b5c45dbb967a5599013cbe2edccdb8dddee 100644 (file)
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../
+XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.

diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index 979e916d7f6199123963e2c73c86f600309062c8..e22cae4fa5fc69367d3df8dc947e269e1dbc3b02 100644 (file)
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../
+XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y := common

diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index 06eee0556cbfa556be5de749c2ed5c4edddccb77..c043977601c422bd09f29afe77c4fd316d756ce0 100644 (file)
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -1,4 +1,4 @@
-XEN_ROOT = ../../../
+XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 # Xen script dir and scripts to go there.